Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 24 Jan 2012 18:05:59 +0000 (10:05 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 24 Jan 2012 18:05:59 +0000 (10:05 -0800)

Trivial merge